Skip to content

gh-149689: add missing error checks in Parser/action_helpers.c#149710

Merged
pablogsal merged 2 commits into
python:mainfrom
KowalskiThomas:kowalski/fix-add-missing-error-checks
Jun 29, 2026
Merged

gh-149689: add missing error checks in Parser/action_helpers.c#149710
pablogsal merged 2 commits into
python:mainfrom
KowalskiThomas:kowalski/fix-add-missing-error-checks

Conversation

@KowalskiThomas

@KowalskiThomas KowalskiThomas commented May 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

@bedevere-app bedevere-app Bot mentioned this pull request May 12, 2026
Closed
@read-the-docs-community

read-the-docs-community Bot commented May 12, 2026 •
edited
Loading

Copy link
Copy Markdown

Documentation build overview

📚 cpython-previews | 🛠️ Build #32650924 | 📁 Comparing 2285902 against main (54a5fd4)

  🔍 Preview build  

154 files changed · ± 150 modified · - 4 deleted

± Modified

- Deleted

eendebakpt
eendebakpt reviewed May 12, 2026
View reviewed changes

@eendebakpt eendebakpt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall.

Comment thread Parser/action_helpers.c Outdated
@@ -1416,6 +1432,9 @@ expr_ty
_PyPegen_template_str(Parser *p, Token *a, asdl_expr_seq *raw_expressions, Token *b) {

asdl_expr_seq *resized_exprs = _get_resized_exprs(p, a, raw_expressions, b, TSTRING);
if (!resized_exprs && PyErr_Occurred()) {

@eendebakpt eendebakpt May 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The && PyErr_Occurred() is redundant here, but is not hurting either.

@KowalskiThomas KowalskiThomas marked this pull request as ready for review May 12, 2026 10:05
pablogsal
pablogsal approved these changes Jun 29, 2026
View reviewed changes

@pablogsal pablogsal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a small nit

Comment thread Parser/action_helpers.c Outdated
@pablogsal pablogsal force-pushed the kowalski/fix-add-missing-error-checks branch from 2285902 to 9c719d8 Compare June 29, 2026 22:49
@pablogsal pablogsal enabled auto-merge (squash) June 29, 2026 22:51
@pablogsal pablogsal added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes needs backport to 3.15 pre-release feature fixes, bugs and security fixes labels Jun 29, 2026
@pablogsal pablogsal merged commit 2dd6e59 into python:main Jun 29, 2026
60 checks passed
@miss-islington-app

miss-islington-app Bot commented Jun 29, 2026

Copy link
Copy Markdown

Thanks @KowalskiThomas for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14, 3.15.
🐍🍒⛏🤖

@bedevere-app

bedevere-app Bot commented Jun 29, 2026

Copy link
Copy Markdown

GH-152640 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 pre-release feature fixes, bugs and security fixes label Jun 29, 2026
@miss-islington-app

miss-islington-app Bot commented Jun 29, 2026

Copy link
Copy Markdown

Sorry, @KowalskiThomas and @pablogsal, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 2dd6e59aea24220975cce2b602846d997413d46c 3.13

@bedevere-app

bedevere-app Bot commented Jun 29, 2026

Copy link
Copy Markdown

GH-152641 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Jun 29, 2026
pablogsal pushed a commit that referenced this pull request Jun 30, 2026
@miss-islington
[3.14] gh-149689: add missing error checks in Parser/action_helpers.c (…
64c4650 
…GH-149710) (#152641)
pablogsal pushed a commit that referenced this pull request Jun 30, 2026
@miss-islington
[3.15] gh-149689: add missing error checks in Parser/action_helpers.c (…
ad55e47 
…GH-149710) (#152640)
@serhiy-storchaka

serhiy-storchaka commented Jul 15, 2026

Copy link
Copy Markdown
Member

Please don't forget about backports.

@KowalskiThomas KowalskiThomas mentioned this pull request Jul 15, 2026
Merged
@KowalskiThomas

KowalskiThomas commented Jul 15, 2026

Copy link
Copy Markdown
Contributor Author

I had definitely forgotten the conflicting backport, thanks for reminding me. Opened #153763.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eendebakpt eendebakpt eendebakpt left review comments
@pablogsal pablogsal pablogsal approved these changes
@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou lysnikolaou is a code owner

Assignees

@pablogsal pablogsal

Labels

needs backport to 3.13 bugs and security fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Missing error / null pointer checks in Parser/action_helpers.c

4 participants

@KowalskiThomas @serhiy-storchaka @eendebakpt @pablogsal